Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 12 Jul 2011 17:46:56 +0000 (10:46 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 12 Jul 2011 17:46:56 +0000 (10:46 -0700)

Trivial merge